Add bookmark popover in SwiftUI #2036
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mallexxx
changed the base branch from
alex/add-folder-modal-swiftui
to
alex/add-bookmark-modal-swiftui
ayoy
approved these changes
Jan 16, 2024
| didSet { | ||
| if oldValue?.id != selectedFolder?.id { | ||
| bookmarkManager.add(bookmark: bookmark, to: selectedFolder) { _ in | ||
| // this is an invalid callback fired before bookmarks finish reloading |
DuckDuckGo/Bookmarks/ViewModel/AddBookmarkPopoverViewModel.swift
Outdated
Show resolved
Hide resolved
| func updateNSView(_ button: NSPopUpButton, context: NSViewRepresentableContext<NSPopUpButtonView>) { | ||
| if let content { | ||
| let newContent = content() | ||
| let diff = newContent.difference(from: context.coordinator.content) { $0 == $1 } |
|
@mallexxx I think I'm getting a diff in Localizable.xcstrings again. Could you make sure it's up to date before merging? Thanks! diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
index a7ba1fe5d..ffd4e14e9 100644
--- a/DuckDuckGo/Localizable.xcstrings
+++ b/DuckDuckGo/Localizable.xcstrings
@@ -4330,7 +4330,7 @@
}
},
"Name:" : {
- "comment" : "New bookmark folder dialog folder name field heading\nAdd Folder popover: folder name text field title"
+ "comment" : "Add Folder popover: folder name text field title\nNew bookmark folder dialog folder name field heading"
},
"navigate.back" : {
"comment" : "Context menu item", |
samsymons
added a commit
that referenced
this pull request
Jan 17, 2024
# By Dominik Kapusta (16) and others # Via Dominik Kapusta (2) and others * main: (67 commits) Increase polling interval for captcha solver (#2071) Add a link to help page in location permission popup (#2017) Add bookmark popover in SwiftUI (#2036) Better detection of AMP pages (#2001) UI adjustments for improved VPN user control (#2043) Don't override drop operation if source view is webView (#2058) Bump version to 1.71.0 (104) Set marketing version to 1.71.0 Update embedded files VPN Geoswitching - look and feel tweaks + Pixels (#2045) fix Bookmarks Manager empty state constraint (#2034) Add Folder modal in SwiftUI (#2033) Fix serverlocation in connection notification (#2053) Use GRDB.swift 2.23.0 (upstream 6.32.0, SQLCipher 4.5.5) (#2021) Bump version to 1.70.0 (103) Update embedded files macOS: Fix issue with not being able to add favorites for existing bookmarks in the latest 1.70.0 internal (#2059) Bump version to 1.70.0 (102) Update embedded files Remove observer from DataBrokerProtectionViewController (#2057) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
samsymons
added a commit
that referenced
this pull request
Jan 18, 2024
* main: Bump BrowserServicesKit Version (#2063) Bump autoconsent to 9.1.0 (#2067) Fix casing in some copy items in Preferences and Main Menu (#2070) Fix vertical alignment of privacy feed shield icon (#2069) Fix giving focus to webView when it's loaded in BrowserTabViewController (#2073) Increase polling interval for captcha solver (#2071) Add a link to help page in location permission popup (#2017) Add bookmark popover in SwiftUI (#2036) Better detection of AMP pages (#2001) UI adjustments for improved VPN user control (#2043) Don't override drop operation if source view is webView (#2058) Bump version to 1.71.0 (104) Set marketing version to 1.71.0 Update embedded files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/276630244458377/1206189080947121/f
Description:
Steps to test this PR:
Internal references:
Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation